From: Raspbian forward pporter Date: Thu, 4 Oct 2018 08:49:45 +0000 (+0100) Subject: Merge version 3.24.0-3+rpi1 and 3.24.1-2 to produce 3.24.1-2+rpi1 X-Git-Tag: archive/raspbian/3.24.1-2+rpi1~3 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=4e5123f3b37ccc84882a67572a25112ce7619414;p=gtk%2B3.0.git Merge version 3.24.0-3+rpi1 and 3.24.1-2 to produce 3.24.1-2+rpi1 --- 4e5123f3b37ccc84882a67572a25112ce7619414 diff --cc debian/changelog index 6b1a2c949e,72734a01c1..cbbc871a5a --- a/debian/changelog +++ b/debian/changelog @@@ -1,18 -1,58 +1,74 @@@ - gtk+3.0 (3.24.0-3+rpi1) buster-staging; urgency=medium ++gtk+3.0 (3.24.1-2+rpi1) buster-staging; urgency=medium + + [changes brought forward from 3.16.6-1+rpi1 by Peter Michael Green at Fri, 25 Sep 2015 01:49:45 +0000] + * Disable wayland backend in debian/rules + * Move libegl1-mesa-dev and libwayland-dev from Depends and Build-Depends to + Build-Conflicts + * Add symbols file hack for wayland changes. + * Fix clean target. + [changes introduced in 3.20.6-2+rpi1 by Peter Michael Green] + * Disable testsuite. + [changes introduced in by Peter Michael Green] + * Manually mark a symbol that was not caught by our symbols file hack as + optional. + - -- Peter Micheal Green Sat, 22 Sep 2018 20:47:39 +0000 ++ -- Raspbian forward porter Thu, 04 Oct 2018 08:49:44 +0000 ++ + gtk+3.0 (3.24.1-2) unstable; urgency=medium + + * Team upload + * Upload to unstable + * d/libgtk-3-0.symbols: Mark gdk_wayland_window_announce_ssd() as + Linux-specific, since we do not enable Wayland on non-Linux. + This might fix FTBFS on kfreebsd-any. + * d/rules: Generate files from .in counterparts for every package, + not just the ones we are going to build. This avoids dh_missing + false positives for files that would have gone into packages not + included in the current build, for example libgtk-3-common during + an amd64-only build. + * d/tests: Also mark reftests as flaky due to a known failure: + symbolic-icon-translucent-color appears to have regressed and now + differs from the reference by 1 column of pixels + * Revert "Temporarily (B-)D on libgl1-mesa-dev and libegl1-mesa-dev" + now that libepoxy has been fixed + * d/p/reftest-known-fail.patch: Reinstate + * Make symbolic-icon-translucent-color.ui non-fatal during + build-time tests + + -- Simon McVittie Sun, 30 Sep 2018 16:45:24 +0100 + + gtk+3.0 (3.24.1-1) experimental; urgency=medium + + * Team upload + * New upstream release + - Bump GLib build-dependency to 2.53.4 as per configure.ac + - d/p/Revert-imwayland-clear-preedit-on-focus-out.patch: + Remove, rely on the upstream fix for #908120 instead + - d/p/GtkApplication-Fix-CRITICAL-on-shutdown-when-register_ses.patch, + d/p/Fix-portal-path-handling.patch: Remove, applied upstream + * Build installed-tests + - Install them in gtk-3-examples for now to avoid the NEW queue + * d/p/no-accessibility-dump.patch: Drop, no longer needed. + The build-time tests correctly set GTK_CSD=1 now. + * Stop marking some reftests as known failures. They now succeed on + all release architectures. + - d/p/reftest-known-fail.patch: Drop, no longer needed + * Run installed-tests as autopkgtests (Closes: #908440) + - Run a11ystate.test separately and mark it as flaky for now due to a + known failure: state/focus1.ui passes in a desktop session but fails + in a minimal autopkgtest VM + * Sort dependency lists (wrap-and-sort -a) + * d/gtk-3-examples.install: Sort file list (wrap-and-sort -a) + * Use the same Xvfb screen configuration as in the upstream GTK+ 4 + Gitlab-CI tests. This will hopefully make GLX work (see also #874077) + * Update d/gbp.conf from glib2.0 + * Temporarily (Build-)Depend on libgl1-mesa-dev and libegl1-mesa-dev to + work around #909173 in libepoxy + * d/rules: Make it clearer that we respect the nocheck option + * d/copyright: Fix some lintian warnings + * Upload to experimental for now, to avoid disrupting migration + + -- Simon McVittie Wed, 19 Sep 2018 23:35:29 +0100 gtk+3.0 (3.24.0-3) unstable; urgency=medium diff --cc debian/control index ea0d61165f,13ed9dcf27..1ffdb32a9b --- a/debian/control +++ b/debian/control @@@ -3,53 -3,53 +3,54 @@@ Section: lib Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: Iain Lane , Jeremy Bicha - Build-Depends: debhelper (>= 10.3~), - gnome-pkg-tools (>= 0.11), - gtk-doc-tools (>= 1.20), - pkg-config, + Build-Depends: adwaita-icon-theme , + at-spi2-core , dbus , + debhelper (>= 10.3~), + gnome-pkg-tools (>= 0.11), + gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - adwaita-icon-theme , - at-spi2-core , - libglib2.0-dev (>= 2.49.4), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.41.0), - libatk1.0-dev (>= 2.15.1), + gtk-doc-tools (>= 1.20), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), + libcairo2-dev (>= 1.14.0), + libcolord-dev (>= 0.1.9), + libcups2-dev (>= 1.2), - libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.4), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libgirepository1.0-dev (>= 1.39.0), + libglib2.0-dev (>= 2.53.4), libharfbuzz-dev (>= 0.9), + libjson-glib-dev, + libpango1.0-dev (>= 1.41.0), + librest-dev, - libwayland-dev (>= 1.9.91) [linux-any], + libxkbcommon-dev (>= 0.2.0), libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, - libxkbcommon-dev (>= 0.2.0), + libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), - libxcursor-dev, - libxcomposite-dev, - libxdamage-dev, - libxkbfile-dev, - libxinerama-dev, - libxfixes-dev, - libcairo2-dev (>= 1.14.0), - libcups2-dev (>= 1.2), - libcolord-dev (>= 0.1.9), - librest-dev, - libjson-glib-dev, - gobject-introspection (>= 1.41.3), - libgirepository1.0-dev (>= 1.39.0), + pkg-config, + wayland-protocols (>= 1.12) [linux-any], xauth , - xvfb , + xvfb +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev - Build-Depends-Indep: libglib2.0-doc, + Build-Depends-Indep: docbook-xml, + docbook-xsl, libatk1.0-doc, - libpango1.0-doc, libcairo2-doc, - docbook-xml, - docbook-xsl, - xsltproc, + libglib2.0-doc, + libpango1.0-doc, + xsltproc Rules-Requires-Root: no Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3 @@@ -130,30 -131,33 +132,32 @@@ Package: libgtk-3-de Section: libdevel Architecture: any Multi-Arch: same - Depends: libgtk-3-0 (= ${binary:Version}), - gir1.2-gtk-3.0 (= ${binary:Version}), - libgtk-3-common, - ${misc:Depends}, - ${shlibs:Depends}, - libglib2.0-dev (>= 2.49.4), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.41), - libatk1.0-dev (>= 2.15.1), + Depends: gir1.2-gtk-3.0 (= ${binary:Version}), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), libcairo2-dev (>= 1.14.0), + libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.0), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libglib2.0-dev (>= 2.49.4), + libpango1.0-dev (>= 1.41), + libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, - libxinerama-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev, libxrandr-dev, - libxcursor-dev, - libxfixes-dev, - libxcomposite-dev, - libxdamage-dev, pkg-config, - libxkbcommon-dev - wayland-protocols (>= 1.12) [linux-any], + ${misc:Depends}, + ${shlibs:Depends}, + libgtk-3-common, + libgtk-3-0 (= ${binary:Version}) Suggests: libgtk-3-doc Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user diff --cc debian/control.in index 7d210a0bf1,2d728c75df..eaaaab1b32 --- a/debian/control.in +++ b/debian/control.in @@@ -3,53 -3,53 +3,54 @@@ Section: lib Priority: optional Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ - Build-Depends: debhelper (>= 10.3~), - gnome-pkg-tools (>= 0.11), - gtk-doc-tools (>= 1.20), - pkg-config, + Build-Depends: adwaita-icon-theme , + at-spi2-core , dbus , + debhelper (>= 10.3~), + gnome-pkg-tools (>= 0.11), + gobject-introspection (>= 1.41.3), gsettings-desktop-schemas , - adwaita-icon-theme , - at-spi2-core , - libglib2.0-dev (>= 2.49.4), - libgdk-pixbuf2.0-dev (>= 2.30.0), - libpango1.0-dev (>= 1.41.0), - libatk1.0-dev (>= 2.15.1), + gtk-doc-tools (>= 1.20), libatk-bridge2.0-dev, + libatk1.0-dev (>= 2.15.1), + libcairo2-dev (>= 1.14.0), + libcolord-dev (>= 0.1.9), + libcups2-dev (>= 1.2), - libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.4), libfontconfig1-dev, + libgdk-pixbuf2.0-dev (>= 2.30.0), + libgirepository1.0-dev (>= 1.39.0), + libglib2.0-dev (>= 2.53.4), libharfbuzz-dev (>= 0.9), + libjson-glib-dev, + libpango1.0-dev (>= 1.41.0), + librest-dev, - libwayland-dev (>= 1.9.91) [linux-any], + libxkbcommon-dev (>= 0.2.0), libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, - libxkbcommon-dev (>= 0.2.0), + libxkbfile-dev, libxml2-utils, libxrandr-dev (>= 2:1.5.0), - libxcursor-dev, - libxcomposite-dev, - libxdamage-dev, - libxkbfile-dev, - libxinerama-dev, - libxfixes-dev, - libcairo2-dev (>= 1.14.0), - libcups2-dev (>= 1.2), - libcolord-dev (>= 0.1.9), - librest-dev, - libjson-glib-dev, - gobject-introspection (>= 1.41.3), - libgirepository1.0-dev (>= 1.39.0), + pkg-config, + wayland-protocols (>= 1.12) [linux-any], xauth , - xvfb , + xvfb +Build-Conflicts: + libegl1-mesa-dev, + libwayland-dev - Build-Depends-Indep: libglib2.0-doc, + Build-Depends-Indep: docbook-xml, + docbook-xsl, libatk1.0-doc, - libpango1.0-doc, libcairo2-doc, - docbook-xml, - docbook-xsl, - xsltproc, + libglib2.0-doc, + libpango1.0-doc, + xsltproc Rules-Requires-Root: no Standards-Version: 4.2.1 Vcs-Browser: https://salsa.debian.org/gnome-team/gtk3 @@@ -130,31 -131,34 +132,30 @@@ Package: @DEV_PKG Section: libdevel Architecture: any Multi-Arch: same - Depends: @SHARED_PKG@ (= ${binary:Version}), - @COMMON_PKG@, - ${misc:Depends}, -Depends: gir1.2-gtk-3.0 (= ${binary:Version}), - libatk-bridge2.0-dev, ++Depends: ${misc:Depends}, + ${shlibs:Depends}, - gir1.2-gtk-3.0 (= ${binary:Version}), - libglib2.0-dev (>= 2.49.4), ++ @COMMON_PKG@, ++ @SHARED_PKG@ (= ${binary:Version}),gir1.2-gtk-3.0 (= ${binary:Version}), libglib2.0-dev (>= 2.49.4), + libgdk-pixbuf2.0-dev (>= 2.30.0), + libpango1.0-dev (>= 1.41), libatk1.0-dev (>= 2.15.1), + libatk-bridge2.0-dev, libcairo2-dev (>= 1.14.0), + libegl1-mesa-dev [linux-any], libepoxy-dev (>= 1.0), libfontconfig1-dev, - libgdk-pixbuf2.0-dev (>= 2.30.0), - libglib2.0-dev (>= 2.49.4), - libpango1.0-dev (>= 1.41), + libwayland-dev (>= 1.9.91) [linux-any], libx11-dev, + libxcomposite-dev, + libxcursor-dev, + libxdamage-dev, libxext-dev, - libxinerama-dev, + libxfixes-dev, libxi-dev, + libxinerama-dev, + libxkbcommon-dev, libxrandr-dev, - libxcursor-dev, - libxfixes-dev, - libxcomposite-dev, - libxdamage-dev, -- pkg-config, - libxkbcommon-dev - wayland-protocols (>= 1.12) [linux-any], - ${misc:Depends}, - ${shlibs:Depends}, - @COMMON_PKG@, - @SHARED_PKG@ (= ${binary:Version}) --Suggests: @DOC_PKG@ ++ pkg-configSuggests: @DOC_PKG@ Description: development files for the GTK+ library GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable diff --cc debian/patches/series index 2b57511c72,5377712ea3..fff52626e6 --- a/debian/patches/series +++ b/debian/patches/series @@@ -5,8 -3,5 +3,6 @@@ 018_gdkenumtypes.c_location.patch 022_disable-viqr-im-for-vi-locale.patch 060_ignore-random-icons.patch - no-accessibility-dump.patch reftest-known-fail.patch - Revert-imwayland-clear-preedit-on-focus-out.patch Don-t-test-default-constructed-GdkPixbuf-properties.patch +auto-3.22.11-1+rpi1-bbd9d41abb4e27ecfc2cd7bd15f11332f36883bf-1491663248 diff --cc debian/rules index d7f49f84eb,74c2d2c6b6..bbb0581e5b --- a/debian/rules +++ b/debian/rules @@@ -106,13 -109,13 +109,13 @@@ els configure_flags_deb += --disable-colord endif -ifeq (linux,$(DEB_HOST_ARCH_OS)) -configure_flags_deb += --enable-wayland-backend -else +#ifeq (linux,$(DEB_HOST_ARCH_OS)) +#configure_flags_deb += --enable-wayland-backend +#else configure_flags_deb += --disable-wayland-backend -endif +#endif - ifeq ($(filter %-doc,$(binaries)),) + ifeq ($(filter %-doc,$(built_binaries)),) configure_flags_deb += --disable-gtk-doc --disable-man endif @@@ -134,11 -137,9 +137,11 @@@ configure_flags_udeb = override_dh_clean: debian/control # gross kludge to force control generation with the %.in target touch debian/control.in - rm -f $(call dh_subst_files,$(binaries)) + rm -f $(call dh_subst_files,$(all_binaries)) rm -f testsuite/reftests/*.ui.known_fail rm -rf debian/build debian/install + sed -i s/optional=nowayland/arch=linux-any/ debian/libgtk-3-0.symbols + rm -rf debian/build debian/install # The build system does not automatically update the GResource files # when resources change. Force an update in case we ship a patch which # modifies the theme CSS files.